Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 23 Jul 2010 02:35:14 +0000 (02:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 23 Jul 2010 02:35:14 +0000 (02:35 +0000)
commit72917ee40d7455c33933fd3f6414e946ca3ae8d2
tree5a0f973f929d420981fd253676ef610da8912662
parent12441e2fb0e963d060b5db20669e409bff04fbcd
parentc90cd4500476992c817775674869eebcedb73111
Merge from mainline.